Repository navigation
chore(fork): merge upstream/main into collin/main (2026-11-19) - #63
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s Chrome, not HeadlessChrome (pingdotgg#38445)
… renders (pingdotgg#38458) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…poser (pingdotgg#38443) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38451) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38489) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38476) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…y the inhibitor failed (pingdotgg#38505)
…pingdotgg#29861) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rkup (pingdotgg#33403) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#34663) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts no longer crashes the server (pingdotgg#30946) Co-authored-by: Isaac-b-ux <264455269+Isaac-b-ux@users.noreply.github.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#38517) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e a refresh while loading (pingdotgg#38508)
… MCP credentials (pingdotgg#26652) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ject file (pingdotgg#38510) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e hold is already met (pingdotgg#38545)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s in generated folder and branch names (pingdotgg#38540) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h screens (pingdotgg#38546) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38856) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad (pingdotgg#38890) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…38944) Co-authored-by: Cursor <cursoragent@cursor.com>
…otgg#38892) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…round work details (pingdotgg#38904) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38917) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38825) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#38848) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the PR merges (pingdotgg#38926) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#38867) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#28029) Co-authored-by: Claude Fable 5.2 (primary) <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…6056) Co-authored-by: maria-rcks <maria@kuuro.net>
…g#30824) Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#34444) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ount (pingdotgg#34194) Co-authored-by: Nicholas Wasmiller <derped@mnpl.fyi> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#23668) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…d of the portable archive (pingdotgg#35268) Co-authored-by: Felix Mrak <180021770+felixleopold@users.noreply.github.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Conflicts: RunExecutionService uses upstream's McpAppModelContext.forProvider and keeps the fork's orchestrator threadInstructions; fakeEnvironment keeps the fork's multi-subscriber shell set and routes upstream's side-chat fork through it. The fork's orchestrator palette titles now go through gt() to satisfy upstream's new no-untranslated-copy lint, with translations in every web locale. Verified: server+web typecheck, RunExecutionService.test.ts (83 pass), ChatView side-chat browser tests (3 pass), lint+knip+i18n:check via pre-commit Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream sync with two conflicts:
RunExecutionService.ts: upstream moved MCP app context reading intoMcpAppModelContext.forProvider; kept that plus the fork's orchestratorthreadInstructions.apps/web/test/fakeEnvironment.ts: kept the fork'sshellSubscribersset; upstream's side-chat fork now offers to all shell subscribers.Also: upstream's new
no-untranslated-copylint flagged the fork's orchestrator palette titles; wrapped ingt()and translated in every web locale.Verified: server+web typecheck, RunExecutionService tests, ChatView side-chat browser tests, lint/knip/i18n:check.
🤖 Generated with Claude Code